From f0f9dfaa22ad85fe8d3cee302fb6ba766f703c8e Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Mon, 6 Nov 2023 10:22:57 +0100 Subject: [PATCH] d/patches: Remove version from install paths --- debian/dcmtk-data.install | 6 ++--- debian/dcmtk-doc.doc-base | 4 ++-- debian/dcmtk-doc.docs | 2 +- debian/dcmtk.examples | 4 ++-- debian/dcmtk.install | 14 ++++++------ .../07_dont_export_all_executables.patch | 8 ++++--- .../{version.patch => fake_version.patch} | 0 debian/patches/remove_version.patch | 22 +++++++++++++++++++ debian/patches/series | 3 ++- 9 files changed, 44 insertions(+), 19 deletions(-) rename debian/patches/{version.patch => fake_version.patch} (100%) create mode 100644 debian/patches/remove_version.patch diff --git a/debian/dcmtk-data.install b/debian/dcmtk-data.install index ffb532b1..7045a559 100644 --- a/debian/dcmtk-data.install +++ b/debian/dcmtk-data.install @@ -1,3 +1,3 @@ -usr/share/dcmtk-*/*.dic -usr/share/dcmtk-*/csmapper/ -usr/share/dcmtk-*/esdb/ +usr/share/dcmtk/*.dic +usr/share/dcmtk/csmapper/ +usr/share/dcmtk/esdb/ diff --git a/debian/dcmtk-doc.doc-base b/debian/dcmtk-doc.doc-base index 761ca1fc..eb33f9e6 100644 --- a/debian/dcmtk-doc.doc-base +++ b/debian/dcmtk-doc.doc-base @@ -8,5 +8,5 @@ Abstract: This manual comprises the complete on-line documentation for the Section: Science/Medicine Format: HTML -Index: /usr/share/doc/dcmtk/dcmtk-3.6.8/html/index.html -Files: /usr/share/doc/dcmtk/dcmtk-3.6.8/html/* +Index: /usr/share/doc/dcmtk/dcmtk/html/index.html +Files: /usr/share/doc/dcmtk/dcmtk/html/* diff --git a/debian/dcmtk-doc.docs b/debian/dcmtk-doc.docs index 9c1434e7..470bae5f 100644 --- a/debian/dcmtk-doc.docs +++ b/debian/dcmtk-doc.docs @@ -1 +1 @@ -usr/share/doc/dcmtk-*/ +usr/share/doc/dcmtk/ diff --git a/debian/dcmtk.examples b/debian/dcmtk.examples index 5f0305a0..25315700 100644 --- a/debian/dcmtk.examples +++ b/debian/dcmtk.examples @@ -1,2 +1,2 @@ -usr/share/dcmtk-*/wlistdb -usr/share/dcmtk-*/wlistqry +usr/share/dcmtk/wlistdb +usr/share/dcmtk/wlistqry diff --git a/debian/dcmtk.install b/debian/dcmtk.install index 8f2456a4..3867465e 100644 --- a/debian/dcmtk.install +++ b/debian/dcmtk.install @@ -1,8 +1,8 @@ -etc/dcmtk-*/* +etc/dcmtk/* usr/bin/* -usr/share/dcmtk-*/*.css -usr/share/dcmtk-*/*.dump -usr/share/dcmtk-*/*.lut -usr/share/dcmtk-*/dcm2xml.dtd -usr/share/dcmtk-*/dsr2xml.xsd -usr/share/dcmtk-*/dumppat.txt +usr/share/dcmtk/*.css +usr/share/dcmtk/*.dump +usr/share/dcmtk/*.lut +usr/share/dcmtk/dcm2xml.dtd +usr/share/dcmtk/dsr2xml.xsd +usr/share/dcmtk/dumppat.txt diff --git a/debian/patches/07_dont_export_all_executables.patch b/debian/patches/07_dont_export_all_executables.patch index f15623b2..4da6ebaf 100644 --- a/debian/patches/07_dont_export_all_executables.patch +++ b/debian/patches/07_dont_export_all_executables.patch @@ -6,9 +6,11 @@ Description: Don't add executables to cmake exports to configure the according package. Bug-Debian: https://bugs.debian.org/803304 Author: Gert Wollny ---- a/CMake/dcmtkMacros.cmake -+++ b/CMake/dcmtkMacros.cmake -@@ -60,11 +60,11 @@ +Index: dcmtk/CMake/dcmtkMacros.cmake +=================================================================== +--- dcmtk.orig/CMake/dcmtkMacros.cmake ++++ dcmtk/CMake/dcmtkMacros.cmake +@@ -55,11 +55,11 @@ macro(DCMTK_ADD_EXECUTABLE PROGRAM) endif() # Collect executable as part of global DCMTK_EXECUTABLE_TARGETS property diff --git a/debian/patches/version.patch b/debian/patches/fake_version.patch similarity index 100% rename from debian/patches/version.patch rename to debian/patches/fake_version.patch diff --git a/debian/patches/remove_version.patch b/debian/patches/remove_version.patch new file mode 100644 index 00000000..033fced9 --- /dev/null +++ b/debian/patches/remove_version.patch @@ -0,0 +1,22 @@ +Description: Remove version +Author: Mathieu Malaterre +Forwarded: not-needed +Last-Update: 2023-11-06 + +Index: dcmtk/CMake/GenerateDCMTKConfigure.cmake +=================================================================== +--- dcmtk.orig/CMake/GenerateDCMTKConfigure.cmake ++++ dcmtk/CMake/GenerateDCMTKConfigure.cmake +@@ -180,9 +180,9 @@ else() + + # Modify the installation paths for configuration files, data files and documents + # by adding a subdirectory with the DCMTK name and version number +- set(CMAKE_INSTALL_FULL_SYSCONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}") +- set(CMAKE_INSTALL_FULL_DATADIR "${CMAKE_INSTALL_FULL_DATADIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}") +- set(CMAKE_INSTALL_FULL_DOCDIR "${CMAKE_INSTALL_FULL_DOCDIR}-${DCMTK_COMPLETE_PACKAGE_VERSION}") ++ set(CMAKE_INSTALL_FULL_SYSCONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/dcmtk") ++ set(CMAKE_INSTALL_FULL_DATADIR "${CMAKE_INSTALL_FULL_DATADIR}/dcmtk") ++ set(CMAKE_INSTALL_FULL_DOCDIR "${CMAKE_INSTALL_FULL_DOCDIR}") + + # These variables are defined as macros in osconfig.h and must end with a path separator + set(DCMTK_DEFAULT_CONFIGURATION_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/") diff --git a/debian/patches/series b/debian/patches/series index d6f66074..4558c419 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,4 +9,5 @@ #ab61e8577ff0974efcfae2907c48baf6023c1160.patch #1c8cca4bf6f7c92fc16f9e66faf49409c891a2b0.patch #f06a867513524664a1b03dfcf812d8b60fdd02cc.patch -version.patch +fake_version.patch +remove_version.patch -- 2.30.2